commit 64848957ba49275896c80790ceeeb6219930f687
author Bernie Innocenti <codewiz@google.com> Fri Apr 27 17:34:30 2018 +0900
committer Bernie Innocenti <codewiz@google.com> Fri Apr 27 17:47:45 2018 +0900
tree 5349b4fbe79f4bbfb9aee8a49b3d4fa72435e2ac
parent 9a9a0772bc04427f3cc23289501a6b56463d1db1

Fix NetdHidlTest.TestAddRemoveInterfaces() The regex in countRulesForFwmark() overeagerly matched rules ending in the same hex digit. For instance, fwmark=3 would match both these lines: from all fwmark 0xd0003/0xdffff iif lo lookup netd13474_27190 from all fwmark 0x10063/0x1ffff iif lo lookup local_network This fix consists in matching either just 0x3, or the zero-padded 0003. Bug: 74922133 Test: as follows: m VtsHalNetNetdV1_1TargetTest && \ adb push out/.../VtsHalNetNetdV1_1TargetTest /data/ && \ adb shell /data/VtsHalNetNetdV1_1TargetTest Change-Id: If6df9fa6cf843a5593ce61d87366c23383bb4d81